messageList: Remove secondary actor API from Message

The secondary actor isn't used for anything anymore.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3103>

diff --git a/data/theme/gnome-shell-sass/widgets/_message-list.scss b/data/theme/gnome-shell-sass/widgets/_message-list.scss
index dbc813d49a7e2e1b1bb676318d6dc3d1114a3b86..0dc1ce3fe671de6a3717242b998c90dfa0d65743 100644 (file)
--- a/data/theme/gnome-shell-sass/widgets/_message-list.scss
+++ b/data/theme/gnome-shell-sass/widgets/_message-list.scss
@@ -99,18 +99,14 @@
       font-weight: bold;
     }
 
-    // secondary container in title box
-    .message-secondary-bin {
-
-      // notification time stamp
-      > .event-time {
-        @extend %caption;
-        color: $insensitive_fg_color;
-        padding-bottom: to_em(1px);
-
-        &:ltr { text-align: right };
-        &:rtl { text-align: left };
-      }
+    // notification time stamp
+    > .event-time {
+      @extend %caption;
+      color: $insensitive_fg_color;
+      padding-bottom: to_em(1px);
+
+      &:ltr { text-align: right };
+      &:rtl { text-align: left };
     }
   }
 

diff --git a/js/ui/messageList.js b/js/ui/messageList.js
index ab0f440da10f2b776bb18a62233ec56b7604781d..d4967ebf6c78a4414eedc9099bfef7dc6a61f32c 100644 (file)
--- a/js/ui/messageList.js
+++ b/js/ui/messageList.js
@@ -409,12 +409,8 @@ export const Message = GObject.registerClass({
         this.setTitle(title);
         titleBox.add_child(this.titleLabel);
 
-        this._secondaryBin = new St.Bin({
-            style_class: 'message-secondary-bin',
-            x_expand: true, y_expand: true,
-            y_align: Clutter.ActorAlign.END,
-        });
-        titleBox.add_child(this._secondaryBin);
+        this._timeLabel = new TimeLabel();
+        titleBox.add_child(this._timeLabel);
 
         this._closeButton = new St.Button({
             style_class: 'message-close-button',
@@ -450,21 +446,11 @@ export const Message = GObject.registerClass({
     }
 
     get datetime() {
-        if (this._secondaryBin.child instanceof TimeLabel)
-            return this._secondaryBin.child.datetime;
-        else
-            return null;
+        return this._timeLabel.datetime;
     }
 
     set datetime(datetime) {
-        if (!(this._secondaryBin.child instanceof TimeLabel))
-            this._secondaryBin.child = new TimeLabel();
-
-        this._secondaryBin.child.set({datetime});
-    }
-
-    setSecondaryActor(actor) {
-        this._secondaryBin.child = actor;
+        this._timeLabel.datetime = datetime;
     }
 
     setTitle(text) {

diff --git a/js/ui/mpris.js b/js/ui/mpris.js
index c68df2f918bbe999d6643eb274fdf413a7b04c7d..f155e377413ca8398fefb89b81487486a8828047 100644 (file)
--- a/js/ui/mpris.js
+++ b/js/ui/mpris.js
@@ -31,7 +31,7 @@ class MediaMessage extends MessageList.Message {
         this.setIcon(this._icon);
 
         // reclaim space used by unused elements
-        this._secondaryBin.hide();
+        this._timeLabel.hide();
         this._closeButton.hide();
 
         this._prevButton = this.addMediaControl('media-skip-backward-symbolic',